Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upstream #8

Merged
merged 25 commits into from
Dec 11, 2024
Merged

upstream #8

merged 25 commits into from
Dec 11, 2024

Conversation

Mor-Dast
Copy link
Owner

No description provided.

AwareFoxy and others added 24 commits December 7, 2024 07:45
* first

* fix govna

* forgot about using FUCK
* Sec always watching

* Убран статус "Подозревается"

* Wanted and Detained
* first

* fix

* fix

* Apply suggestions from code review

Co-authored-by: FN <[email protected]>

* fix

* Apply suggestions from code review

* fix

---------

Co-authored-by: AwareFoxy <[email protected]>
Co-authored-by: FN <[email protected]>
* Fix

* Delete Resources/Prototypes/_CorvaxNext/Catalog/uplink-catalog.yml

* lol
* Added artificial bluespace crystals

* Added transitor

* Updated locale & minor fixes

* Xddd

* Update Content.Client/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterMenu.xaml.cs

Co-authored-by: FN <[email protected]>

* Update Resources/Prototypes/_CorvaxNext/Entities/Structures/Power/substations.yml

Co-authored-by: FN <[email protected]>

* Update Content.Server/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterSystem.cs

Co-authored-by: FN <[email protected]>

* Rename reseted to reset

* Separated map count

* Update BluespaceHarvesterSystem.cs

---------

Co-authored-by: FN <[email protected]>
* innate mineral scanner

* Update Resources/Prototypes/Entities/Mobs/Species/dwarf.yml

Co-authored-by: lzk <[email protected]>

* Update Dwarf.xml

---------

Co-authored-by: lzk <[email protected]>
Плата мед. биофаба в шкафчике СМО
…ble_biofab

Изучаемый мед. фабрикатор
* innate mineral scanner

* Security Badges

* Брейклайны
* ExeCute

* fix?

* nope

* fix: formatting
- remove useless comments
- if statement in OnSignalRecieved() should be handled in switch-case
- Logger class shouldn't be used in logging, there is sawmills for this
- Remove unnecessary methods

* some more shit

* wrong author

---------

Co-authored-by: JerryImMouse <[email protected]>
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

github-actions bot commented Dec 11, 2024

RSI Diff Bot; head commit 2662863 merging into 3eaf67c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Machines/limbgrower.rsi

State Old New Status
limbgrower_fill Removed
limbgrower_idleoff Removed
limbgrower_idleon Removed
limbgrower_openpanel Removed
limbgrower_panelopen Removed
limbgrower_unfill Removed

Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi

State Old New Status
offer_item Removed

Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi

State Old New Status
equipped-EYES-off Added
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/brigmedbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/cadetbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/detbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/hosbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/officerbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/pilotbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/wardenbadge.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Interface/Alerts/offer_item.rsi

State Old New Status
offer_item Added

Resources/Textures/_CorvaxNext/Objects/Devices/cartridge.rsi

State Old New Status
cart-cri Added

Resources/Textures/_CorvaxNext/Objects/Structures/Power/bluespace_transitor.rsi

State Old New Status
beam Added
display Added
idle Added
offline Added

Resources/Textures/_CorvaxNext/Structures/Furniture/execution_chair.rsi

State Old New Status
execution-chair Added

Resources/Textures/_CorvaxNext/Structures/Machines/limbgrower.rsi

State Old New Status
limbgrower_fill Added
limbgrower_idleoff Added
limbgrower_idleon Added
limbgrower_openpanel Added
limbgrower_panelopen Added
limbgrower_unfill Added

Edit: diff updated after 2662863

@Mor-Dast Mor-Dast merged commit da9ba5a into master Dec 11, 2024
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants